debian: switch to debhelper compat version 13

Thanks to Diederik de Haas for helping with this.

Signed-off-by: Maximilian Engelhardt <maxi@daemonizer.de>

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/debian/control b/debian/control
index 20136b144ff08edb708f630598d0388c2cde9e83..69ab5ab1cd9c27bfa12e588238bcbdf2fda6b8c4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Ian Jackson <iwj@xenproject.org>, Hans van Kranenburg <hans@knorrie.o
 Section: admin
 Standards-Version: 4.6.2
 Build-Depends:
-   debhelper (>= 10),
+   debhelper-compat (= 13),
    dh-exec,
    dpkg-dev (>= 1.16.0~),
    file,

diff --git a/debian/rules b/debian/rules
index 78bfdf5ea5276bfb4c3b27dadbfb1d0a435253cf..7f03e5cf9f6b0002b11e4c8fb1361442ae371bc0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -301,16 +301,10 @@ override_dh_installinit:
        dh_installinit --name xen --no-start -- defaults
        dh_installinit --name xendomains --no-start -- defaults
 
-# dh_strip in dh compat 10 and earlier (which we are at so this
-# package builds on stretch) looks at filenames and modes to decide
-# what to process.  hvmloader doesn't match, so we must trick it.
-# It is sufficient to make it executable.  And we have to undo
-# that again, then.  This all happens after dh_install so we operate
-# on the package-specific file.
+# Don't strip the .note section from xen-shim. See also
+# debian/xen-utils-V.lintian-overrides.vsn-in
 override_dh_strip:
-       find debian/xen-utils-* -name hvmloader | xargs -r chmod -v +x
-       dh_strip
-       find debian/xen-utils-* -name hvmloader | xargs -r chmod -v -x
+       dh_strip --exclude=xen-shim
 
 # Hardlink the various xenstore-* programs together.  This is an
 # argv[0]-using binary of which we can have only one copy.  We need to